Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'master' into soroban #527

Merged
merged 3 commits into from
Sep 12, 2023

Conversation

overcat
Copy link
Member

@overcat overcat commented Sep 12, 2023

This PR does not contain any code changes, it is only merging the code from the master branch into the soroban branch for us to work on removing guava.

I think we should merge this PR using the Rebase and Merge.

@overcat overcat marked this pull request as ready for review September 12, 2023 11:28
@sreuland
Copy link
Contributor

@overcat , to confirm, this is ready to merge as rebase, and the android-test failure is not issue?

@overcat
Copy link
Member Author

overcat commented Sep 12, 2023

@sreuland Let's merge it first. I haven't found the cause of the android test api 33 test failure yet, so let's ignore it for now. It runs fine on my local machine, but behaves inconsistently on GitHub Actions. It seems to be related to the performance of the assigned testing machines.

@sreuland sreuland merged commit 00da8ab into lightsail-network:soroban Sep 12, 2023
6 of 7 checks passed
sreuland added a commit that referenced this pull request Sep 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants